Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 9 Feb 2012 16:19:43 +0000 (08:19 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 9 Feb 2012 16:19:43 +0000 (08:19 -0800)

Trivial merge